merge
authorKenichi Handa <handa@m17n.org>
Wed, 24 Aug 2011 07:31:56 +0000 (16:31 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 24 Aug 2011 07:31:56 +0000 (16:31 +0900)
commitc570130e74b2229a1bf4cdcaab199c39631b4716
tree6125a2c0ce1cbb4f8420954e1ede59ca3e2e8a87
parent049e6d49e08326731e64d08bd37722627c324178
parentb88dcaa2c9f91d8842e7691a13ef9b98e21f8b90
merge